Backport fix for Bug#11677 from trunk
authorChong Yidong <cyd@gnu.org>
Mon, 13 Aug 2012 05:12:15 +0000 (13:12 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 13 Aug 2012 05:12:15 +0000 (13:12 +0800)

Trivial merge